<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-10 13:45:37 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>git difftool</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Inspection_and_Comparison">
                                Inspection and Comparison                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="4ae2c96a3d7668e0c0d0a8595aefc4145916ded21cc3981078ef136d9ffa7cea/a2" data-source="git-difftool" onmousemove="i18n(this)">git-difftool</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="dd9aea3a0b90f6b8760b2061e00e9a322543bb1c4f5d7f908185070726804c59/37" data-source="git-difftool - Show changes using common diff tools" onmousemove="i18n(this)">git-difftool &mdash; &Pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&khcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <div> <pre class="hljs language-css">git difftool <span class="hljs-selector-attr">[&lt;options&gt;]</span> <span class="hljs-selector-attr">[&lt;commit&gt; [&lt;commit&gt;]</span>] <span class="hljs-selector-attr">[--]</span> <span class="hljs-selector-attr">[&lt;path&gt;&hellip;&ZeroWidthSpace;]</span></pre> </div> </div> <h2 class="text-body-emphasis"  id="_description"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="c7a72328c951c5b2991861cc27fa6504c186dd9f3801a3cba869fb0eead91528/a4" data-source="&lt;code&gt;git difftool&lt;/code&gt; is a Git command that allows you to compare and edit files between revisions using common diff tools. &lt;code&gt;git difftool&lt;/code&gt; is a frontend to &lt;code&gt;git diff&lt;/code&gt; and accepts the same options and arguments. See &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt;." onmousemove="i18n(this)"><code>git difftool</code>  &mdash; &ecy;&tcy;&ocy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy;  Git , &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&icy;&vcy;&acy;&tcy;&softcy; &icy; &rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&acy;&zcy;&ncy;&ycy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&jcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&khcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;.  <code>git difftool</code>  &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &icy;&ncy;&tcy;&iecy;&rcy;&fcy;&iecy;&jcy;&scy;&ocy;&mcy;  <code>git diff</code>  &icy; &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&iecy;&tcy; &tcy;&iecy; &zhcy;&iecy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy; &icy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ycy;. &Scy;&mcy;.  <a href="git-diff.html">git-diff[1]</a> .</span></p> </div> <h2 class="text-body-emphasis"  id="_options"><span data-i18n="d0db8b5e364b6989e4b8f38a2b3846b87d99a51c1592ebf35d21cc66405a8e39/b6" data-source="Options" onmousemove="i18n(this)">Options</span></h2> <div> <div> <dl> <dt id="Documentation/git-difftool.txt--d"><span data-i18n="50e09407a18bedd64baf0b99825a8178d7446731615b85452ea6b99573469dcc/b1" data-source="-d" onmousemove="i18n(this)">-d</span></dt> <dt id="Documentation/git-difftool.txt---dir-diff"><span data-i18n="99c833cc53731fce4fbf599d1cc121f722887502376f0dc4415bb86c1b311285/4d" data-source="--dir-diff" onmousemove="i18n(this)">--dir-diff</span></dt> <dd> <p><span data-i18n="5c2c4ba3c191101b870767bca766d146f2e6e77daad0f333a100d3fe19c2c555/11" data-source="Copy the modified files to a temporary location and perform a directory diff on them. This mode never prompts before launching the diff tool." onmousemove="i18n(this)">&Scy;&kcy;&ocy;&pcy;&icy;&rcy;&ucy;&jcy;&tcy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&iecy; &rcy;&acy;&scy;&pcy;&ocy;&lcy;&ocy;&zhcy;&iecy;&ncy;&icy;&iecy; &icy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &dcy;&lcy;&yacy; &ncy;&icy;&khcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy;. &Vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&iecy;&zhcy;&icy;&mcy;&iecy; &ncy;&icy;&kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &pcy;&ocy;&yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &zcy;&acy;&pcy;&rcy;&ocy;&scy; &pcy;&iecy;&rcy;&iecy;&dcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt--y"><span data-i18n="6287c641a5597c1f18b6da8e4df91bfffc6a66bccf10561174a00116059b5735/a3" data-source="-y" onmousemove="i18n(this)">-y</span></dt> <dt id="Documentation/git-difftool.txt---no-prompt"><span data-i18n="38a33d6a8c15a9adc4b28cdc0c5c1fa07aba9e8a5df8b5812111b3af20149010/f8" data-source="--no-prompt" onmousemove="i18n(this)">--no-prompt</span></dt> <dd> <p><span data-i18n="a526b1beb86bb96d1fdaf8be7e1f9bdcb2f1b7200c75573ce05be1d6f60425d2/c1" data-source="Do not prompt before launching a diff tool." onmousemove="i18n(this)">&Ncy;&iecy; &zcy;&acy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&jcy;&tcy;&iecy; &zcy;&acy;&pcy;&rcy;&ocy;&scy; &pcy;&iecy;&rcy;&iecy;&dcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt---prompt"><span data-i18n="420da8063e51b09b73d521127015059543e5d256e9f25f6ae676d8241831ee61/67" data-source="--prompt" onmousemove="i18n(this)">--prompt</span></dt> <dd> <p><span data-i18n="a6d41c3d45c87ae411dcd3b630417e93c8e47a5d7dc0cf157cf12b896b040932/83" data-source="Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&dcy; &kcy;&acy;&zhcy;&dcy;&ycy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&mcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;; &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &lcy;&yucy;&bcy;&ycy;&iecy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt---rotate-toltfilegt"><span data-i18n="d1b124157fa6244019d55358b4b7952ea2b6e19643b2b8e1f17d5d56ff384123/98" data-source="--rotate-to=&amp;lt;file&amp;gt;" onmousemove="i18n(this)">--rotate-to=&lt;file&gt;</span></dt> <dd> <p><span data-i18n="c34158988f6458f63a7b1a9754b0a25b7e01faa8b4485540e9dcc88f06bfb83f/b3" data-source="Start showing the diff for the given path, the paths before it will move to the end and output." onmousemove="i18n(this)">&Ncy;&acy;&chcy;&ncy;&icy;&tcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &dcy;&lcy;&yacy; &dcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &pcy;&ucy;&tcy;&icy;, &pcy;&ucy;&tcy;&icy; &dcy;&ocy; &ncy;&iecy;&gcy;&ocy; &pcy;&iecy;&rcy;&iecy;&jcy;&dcy;&ucy;&tcy; &vcy; &kcy;&ocy;&ncy;&iecy;&tscy; &icy; &vcy;&ycy;&vcy;&iecy;&dcy;&ucy;&tcy;&scy;&yacy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt---skip-toltfilegt"><span data-i18n="6117b4db2b9edd75326862d72986fa91acd9e8763de4d101939def1247567ddc/f0" data-source="--skip-to=&amp;lt;file&amp;gt;" onmousemove="i18n(this)">--skip-to=&lt;file&gt;</span></dt> <dd> <p><span data-i18n="bd8e51e17135dbe1ad52e12cd454494bcc84d2205af46105c251a90b7ef7630d/4f" data-source="Start showing the diff for the given path, skipping all the paths before it." onmousemove="i18n(this)">&Ncy;&acy;&chcy;&ncy;&icy;&tcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &dcy;&lcy;&yacy; &dcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &pcy;&ucy;&tcy;&icy;, &pcy;&rcy;&ocy;&pcy;&ucy;&scy;&kcy;&acy;&yacy; &vcy;&scy;&iecy; &pcy;&ucy;&tcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy; &ncy;&icy;&mcy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt--tlttoolgt"><span data-i18n="fa549b8f83ddff9069c325e35efef6d9d84e2a689a18aea80f3ab4df06f008b6/26" data-source="-t &amp;lt;tool&amp;gt;" onmousemove="i18n(this)">-t &lt;tool&gt;</span></dt> <dt id="Documentation/git-difftool.txt---toollttoolgt"><span data-i18n="27e49e95f5d87489b3e67e643db4b7d88f09b062276ab06fcd7aae890156a93f/33" data-source="--tool=&amp;lt;tool&amp;gt;" onmousemove="i18n(this)">--tool=&lt;tool&gt;</span></dt> <dd> <p><span data-i18n="819833f55bce0621a13cc1257a8d14ea19f6a6cd27d90f29a72b5389a02d02b1/06" data-source="Use the diff tool specified by &amp;lt;tool&amp;gt;. Valid values include emerge, kompare, meld, and vimdiff. Run &lt;code&gt;git difftool --tool-help&lt;/code&gt; for the list of valid &amp;lt;tool&amp;gt; settings." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;, &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&jcy; &vcy; &lt;tool&gt;. &Dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;: &laquo;emerging&raquo;, &laquo;kompare&raquo;, &laquo;meld&raquo; &icy; &laquo;vimdiff&raquo;. &Zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy;  <code>git difftool --tool-help</code>  &dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&icy;&yacy; &scy;&pcy;&icy;&scy;&kcy;&acy; &dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&khcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&kcy; &lt;tool&gt;.</span></p> <p><span data-i18n="c656080cfc55030672bd5f1a212211ef5833985362e774aa9c041d401f89a014/b5" data-source="If a diff tool is not specified, &lt;code&gt;git difftool&lt;/code&gt; will use the configuration variable &lt;code&gt;diff.tool&lt;/code&gt;. If the configuration variable &lt;code&gt;diff.tool&lt;/code&gt; is not set, &lt;code&gt;git difftool&lt;/code&gt; will pick a suitable default." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;,  <code>git difftool</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>diff.tool</code> . &IEcy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>diff.tool</code>  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&acy;,  <code>git difftool</code>  &vcy;&ycy;&bcy;&iecy;&rcy;&iecy;&tcy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.</span></p> <p><span data-i18n="175f63f12babeebff95ad2d722fdd92a2e7532041f68622284388f3d3302e7a1/49" data-source="You can explicitly provide a full path to the tool by setting the configuration variable &lt;code&gt;difftool.&amp;lt;tool&amp;gt;.path&lt;/code&gt;. For example, you can configure the absolute path to kdiff3 by setting &lt;code&gt;difftool.kdiff3.path&lt;/code&gt;. Otherwise, &lt;code&gt;git difftool&lt;/code&gt; assumes the tool is available in PATH." onmousemove="i18n(this)">&Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &yacy;&vcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &pcy;&ocy;&lcy;&ncy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy; &kcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ucy;, &zcy;&acy;&dcy;&acy;&vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>difftool.&lt;tool&gt;.path</code> . &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &acy;&bcy;&scy;&ocy;&lcy;&yucy;&tcy;&ncy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy; &kcy; kdiff3, &zcy;&acy;&dcy;&acy;&vcy;  <code>difftool.kdiff3.path</code> . &Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;  <code>git difftool</code>  &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&iecy;&ncy; &vcy; PATH.</span></p> <p><span data-i18n="3aa6c61c30f326cda46ed36091731c864428320508eb3766bd3dfacb63b5ef17/19" data-source="Instead of running one of the known diff tools, &lt;code&gt;git difftool&lt;/code&gt; can be customized to run an alternative program by specifying the command line to invoke in a configuration variable &lt;code&gt;difftool.&amp;lt;tool&amp;gt;.cmd&lt;/code&gt;." onmousemove="i18n(this)">&Vcy;&mcy;&iecy;&scy;&tcy;&ocy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &icy;&zcy; &icy;&zcy;&vcy;&iecy;&scy;&tcy;&ncy;&ycy;&khcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;  <code>git difftool</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &dcy;&lcy;&yacy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &acy;&lcy;&softcy;&tcy;&iecy;&rcy;&ncy;&acy;&tcy;&icy;&vcy;&ncy;&ocy;&jcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy;, &ucy;&kcy;&acy;&zcy;&acy;&vcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ucy;&yucy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy; &dcy;&lcy;&yacy; &vcy;&ycy;&zcy;&ocy;&vcy;&acy; &vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>difftool.&lt;tool&gt;.cmd</code> .</span></p> <p><span data-i18n="6d5a1ab290f3314253dd78c6fd0047d74c38c18c277f21690f590109d4a52144/39" data-source="When &lt;code&gt;git difftool&lt;/code&gt; is invoked with this tool (either through the &lt;code&gt;-t&lt;/code&gt; or &lt;code&gt;--tool&lt;/code&gt; option or the &lt;code&gt;diff.tool&lt;/code&gt; configuration variable) the configured command line will be invoked with the following variables available: &lt;code&gt;$LOCAL&lt;/code&gt; is set to the name of the temporary file containing the contents of the diff pre-image and &lt;code&gt;$REMOTE&lt;/code&gt; is set to the name of the temporary file containing the contents of the diff post-image. &lt;code&gt;$MERGED&lt;/code&gt; is the name of the file which is being compared. &lt;code&gt;$BASE&lt;/code&gt; is provided for compatibility with custom merge tool commands and has the same value as &lt;code&gt;$MERGED&lt;/code&gt;." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  <code>git difftool</code>  &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ecy;&tcy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; (&lcy;&icy;&bcy;&ocy; &chcy;&iecy;&rcy;&iecy;&zcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;  <code>-t</code>  &icy;&lcy;&icy;  <code>--tool</code> , &lcy;&icy;&bcy;&ocy; &chcy;&iecy;&rcy;&iecy;&zcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&ocy;&ncy;&ncy;&ucy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy;  <code>diff.tool</code> ), &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &scy;&ocy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&mcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy;:  <code>$LOCAL</code>  &ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&acy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&acy; diff. &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&iecy; &icy;&zcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&iecy;, &acy; &dcy;&lcy;&yacy;  <code>$REMOTE</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &pcy;&ocy;&scy;&tcy;-&icy;&zcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;.  <code>$MERGED</code>  &mdash; &icy;&mcy;&yacy; &scy;&rcy;&acy;&vcy;&ncy;&icy;&vcy;&acy;&iecy;&mcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;.  <code>$BASE</code>  &pcy;&rcy;&iecy;&dcy;&ucy;&scy;&mcy;&ocy;&tcy;&rcy;&iecy;&ncy; &dcy;&lcy;&yacy; &scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &scy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&mcy;&icy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy;&mcy;&icy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &icy;&mcy;&iecy;&iecy;&tcy; &tcy;&ocy; &zhcy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &icy;  <code>$MERGED</code> .</span></p> </dd> <dt id="Documentation/git-difftool.txt---tool-help"><span data-i18n="d923596834de9f3ac04d4a9376a78b08f9fe3c4ba7197c791d497fba8a103e6c/3c" data-source="--tool-help" onmousemove="i18n(this)">--tool-help</span></dt> <dd> <p><span data-i18n="ece521475708188e6907e94d0053b73e31edb4fed521ebb8dd8b6a2eb5bb3ea4/d2" data-source="Print a list of diff tools that may be used with &lt;code&gt;--tool&lt;/code&gt;." onmousemove="i18n(this)">&Rcy;&acy;&scy;&pcy;&iecy;&chcy;&acy;&tcy;&acy;&jcy;&tcy;&iecy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;  <code>--tool</code> .</span></p> </dd> <dt id="Documentation/git-difftool.txt---no-symlinks"><span data-i18n="e02af28e73a9ba267b7a44e953bb46bfff7b43f608807d512e87ecb36af28e19/31" data-source="--[no-]symlinks" onmousemove="i18n(this)">--[no-]symlinks</span></dt> <dd> <p><span data-i18n="fa22c0fb4ced1295245e75afbd4d227331271b115285bbc7c44581c9b2e646a2/8b" data-source="&lt;code&gt;git difftool&lt;/code&gt;&amp;apos;s default behavior is to create symlinks to the working tree when run in &lt;code&gt;--dir-diff&lt;/code&gt; mode and the right-hand side of the comparison yields the same content as the file in the working tree." onmousemove="i18n(this)">&Pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy;  <code>git difftool</code>  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &zcy;&acy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&icy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &scy;&scy;&ycy;&lcy;&ocy;&kcy; &ncy;&acy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &pcy;&rcy;&icy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&iecy; &vcy; &rcy;&iecy;&zhcy;&icy;&mcy;&iecy;  <code>--dir-diff</code> , &acy; &pcy;&rcy;&acy;&vcy;&acy;&yacy; &chcy;&acy;&scy;&tcy;&softcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &dcy;&acy;&iecy;&tcy; &tcy;&ocy; &zhcy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy;, &chcy;&tcy;&ocy; &icy; &fcy;&acy;&jcy;&lcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;.</span></p> <p><span data-i18n="92de74a639e1c604911a8b29ad2d29860e5413f81714a1608f357469c06ab7ba/43" data-source="Specifying &lt;code&gt;--no-symlinks&lt;/code&gt; instructs &lt;code&gt;git difftool&lt;/code&gt; to create copies instead. &lt;code&gt;--no-symlinks&lt;/code&gt; is the default on Windows." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;  <code>--no-symlinks</code> , &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy;  <code>git difftool</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&zcy;&dcy;&acy;&vcy;&acy;&tcy;&softcy; &kcy;&ocy;&pcy;&icy;&icy;.  <code>--no-symlinks</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &vcy; Windows.</span></p> </dd> <dt id="Documentation/git-difftool.txt--xltcommandgt"><span data-i18n="ce998e2891c5357ed48d52d38c1e0bdaad4d10a83db4bffebd64a32289086123/82" data-source="-x &amp;lt;command&amp;gt;" onmousemove="i18n(this)">-x &lt;command&gt;</span></dt> <dt id="Documentation/git-difftool.txt---extcmdltcommandgt"><span data-i18n="c363d9db414c019fa805398393d840a07a20d49f3135b6115c5d9e3a97cfa497/17" data-source="--extcmd=&amp;lt;command&amp;gt;" onmousemove="i18n(this)">--extcmd=&lt;command&gt;</span></dt> <dd> <p><span data-i18n="8834a8f8717821470d26b2e4627f86b47e6099054115c125189c7865e0b21e53/ab" data-source="Specify a custom command for viewing diffs. &lt;code&gt;git-difftool&lt;/code&gt; ignores the configured defaults and runs &lt;code&gt;$command $LOCAL $REMOTE&lt;/code&gt; when this option is specified. Additionally, &lt;code&gt;$BASE&lt;/code&gt; is set in the environment." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &dcy;&lcy;&yacy; &pcy;&rcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;.  <code>git-difftool</code>  &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&iecy;&tcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy;  <code>$command $LOCAL $REMOTE</code> , &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &ecy;&tcy;&ocy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;. &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &vcy; &scy;&rcy;&iecy;&dcy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;  <code>$BASE</code> .</span></p> </dd> <dt id="Documentation/git-difftool.txt--g"><span data-i18n="e34b6f1266cf79b5e6ed49b1038dbe26f8da6d09bb556143ca2e4fb0a4ad065c/06" data-source="-g" onmousemove="i18n(this)">-g</span></dt> <dt id="Documentation/git-difftool.txt---no-gui"><span data-i18n="931768e89a09012ee459658759f47675bf2822fe4d0ba7cc6f63c6a3b7c7c715/4a" data-source="--[no-]gui" onmousemove="i18n(this)">--[no-]gui</span></dt> <dd> <p><span data-i18n="f5e42677af8f6f915022dca7de15116c2af1ea43c72cbf66f16a8aed1a4f05ed/2c" data-source="When &lt;code&gt;git-difftool&lt;/code&gt; is invoked with the &lt;code&gt;-g&lt;/code&gt; or &lt;code&gt;--gui&lt;/code&gt; option the default diff tool will be read from the configured &lt;code&gt;diff.guitool&lt;/code&gt; variable instead of &lt;code&gt;diff.tool&lt;/code&gt;. This may be selected automatically using the configuration variable &lt;code&gt;difftool.guiDefault&lt;/code&gt;. The &lt;code&gt;--no-gui&lt;/code&gt; option can be used to override these settings. If &lt;code&gt;diff.guitool&lt;/code&gt; is not set, we will fallback in the order of &lt;code&gt;merge.guitool&lt;/code&gt;, &lt;code&gt;diff.tool&lt;/code&gt;, &lt;code&gt;merge.tool&lt;/code&gt; until a tool is found." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  <code>git-difftool</code>  &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy;  <code>-g</code>  &icy;&lcy;&icy;  <code>--gui</code> , &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &icy;&zcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy;  <code>diff.guitool</code>  &vcy;&mcy;&iecy;&scy;&tcy;&ocy;  <code>diff.tool</code> . &Ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&ycy;&bcy;&rcy;&acy;&tcy;&softcy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>difftool.guiDefault</code> . &Ocy;&pcy;&tscy;&icy;&yucy;  <code>--no-gui</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &ocy;&tcy;&mcy;&iecy;&ncy;&ycy; &ecy;&tcy;&icy;&khcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&kcy;. &IEcy;&scy;&lcy;&icy;  <code>diff.guitool</code>  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;, &mcy;&ycy; &bcy;&ucy;&dcy;&iecy;&mcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&tcy;&softcy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy; &vcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&iecy;  <code>merge.guitool</code> ,  <code>diff.tool</code> ,  <code>merge.tool</code> , &pcy;&ocy;&kcy;&acy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &ncy;&acy;&jcy;&dcy;&iecy;&ncy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt---no-trust-exit-code"><span data-i18n="0f5571825ae0f60a745c3a5cc4abd77f4b6704b000452d4385adcd25ade467f6/24" data-source="--[no-]trust-exit-code" onmousemove="i18n(this)">--[no-]trust-exit-code</span></dt> <dd> <p><span data-i18n="9bf2326633b3a7126045f8f160345b55b2958f24f1a51f2880a683c1f7dfe839/72" data-source="&lt;code&gt;git-difftool&lt;/code&gt; invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use &lt;code&gt;--trust-exit-code&lt;/code&gt; to make &lt;code&gt;git-difftool&lt;/code&gt; exit when an invoked diff tool returns a non-zero exit code." onmousemove="i18n(this)"><code>git-difftool</code>  &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&ncy;&dcy;&icy;&vcy;&icy;&dcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;. &Ocy;&shcy;&icy;&bcy;&kcy;&icy;, &ocy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &scy;&ocy;&ocy;&bcy;&shchcy;&acy;&iecy;&tcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;, &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy;. &Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>--trust-exit-code</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &zcy;&acy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy;  <code>git-difftool</code>  &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy;&softcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy;, &kcy;&ocy;&gcy;&dcy;&acy; &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy; &ncy;&iecy;&ncy;&ucy;&lcy;&iecy;&vcy;&ocy;&jcy; &kcy;&ocy;&dcy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy;.</span></p> <p><span data-i18n="95f196a5d15c23e879ea2a600baa74341d73707dd4c83cf6f8803b1695da78a0/cb" data-source="&lt;code&gt;git-difftool&lt;/code&gt; will forward the exit code of the invoked tool when &lt;code&gt;--trust-exit-code&lt;/code&gt; is used." onmousemove="i18n(this)"><code>git-difftool</code>  &pcy;&iecy;&rcy;&iecy;&scy;&ycy;&lcy;&acy;&iecy;&tcy; &kcy;&ocy;&dcy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &pcy;&rcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&icy;  <code>--trust-exit-code</code> .</span></p> </dd> </dl> </div> <p><span data-i18n="50952ee1c11d32a4fd1de67c11ab7b393ba78743b7c55bc6d71d026e544c51ed/f3" data-source="See &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt; for the full list of supported options." onmousemove="i18n(this)">&Pcy;&ocy;&lcy;&ncy;&ycy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&mcy;&ycy;&khcy; &ocy;&pcy;&tscy;&icy;&jcy; &scy;&mcy;. &vcy;  <a href="git-diff.html">git-diff[1]</a> .</span></p> </div> <h2 class="text-body-emphasis"  id="_configuration"><span data-i18n="b332c3492d5eb10a118eb6d8b0dcd689bc2477ce2ae16b303753b942b54377bc/aa" data-source="Configuration" onmousemove="i18n(this)">Configuration</span></h2> <div> <p><span data-i18n="42b43c01de60496528e1345d676cf609151b17c99995efc41d0099db888ef764/62" data-source="&lt;code&gt;git difftool&lt;/code&gt; falls back to &lt;code&gt;git mergetool&lt;/code&gt; config variables when the difftool equivalents have not been defined." onmousemove="i18n(this)"><code>git difftool</code>  &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&mcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>git mergetool</code> , &iecy;&scy;&lcy;&icy; &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ycy; difftool &ncy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ycy;.</span></p> <p><span data-i18n="a0fa656f09c40af871f0a58caeea15390872ffb9b4e2037c00ece4df3c0023ad/b5" data-source="Everything above this line in this section isn&amp;rsquo;t included from the &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt; documentation. The content that follows is the same as what&amp;rsquo;s found there:" onmousemove="i18n(this)">&Vcy;&scy;&iecy;, &chcy;&tcy;&ocy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &vcy;&ycy;&shcy;&iecy; &ecy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;, &ncy;&iecy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &vcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&yucy;  <a href="git-config.html">git-config[1]</a> . &Scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &tcy;&acy;&kcy;&ocy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &icy; &ncy;&acy;&jcy;&dcy;&iecy;&ncy;&ncy;&ocy;&iecy; &tcy;&acy;&mcy;:</span></p> <div> <dl> <dt id="Documentation/git-difftool.txt-difftool"><span data-i18n="766d73c6f4221e59863075bb518455201157309183d4cc3386d388586178d53a/59" data-source="diff.tool" onmousemove="i18n(this)">diff.tool</span></dt> <dd> <p><span data-i18n="377f373d57aa6115939375ae228857861dfc7294b1dce5948bc616a0b0316681/23" data-source="Controls which diff tool is used by &lt;a href=&quot;git-difftool&quot;&gt;git-difftool[1]&lt;/a&gt;. This variable overrides the value configured in &lt;code&gt;merge.tool&lt;/code&gt;. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.&amp;lt;tool&amp;gt;.cmd variable is defined." onmousemove="i18n(this)">&Ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &tcy;&iecy;&mcy;, &kcy;&acy;&kcy;&ocy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  <a href="git-difftool.html">git-difftool[1]</a> . &Ecy;&tcy;&acy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&iecy; &vcy;  <code>merge.tool</code> . &Vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &ncy;&icy;&zhcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&ncy;&ycy; &dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;. &Lcy;&yucy;&bcy;&ocy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &icy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; difftool.&lt;tool&gt;.cmd.</span></p> </dd> <dt id="Documentation/git-difftool.txt-diffguitool"><span data-i18n="edc3cdfcbd3bc772fb960ab385997cab53f36825e46c81a7976bc189740690b0/82" data-source="diff.guitool" onmousemove="i18n(this)">diff.guitool</span></dt> <dd> <p><span data-i18n="ed8df00962c65bcd88c0a3da1acfb9e04a29ab71b5a265515dcdb0f56a87fa7a/92" data-source="Controls which diff tool is used by &lt;a href=&quot;git-difftool&quot;&gt;git-difftool[1]&lt;/a&gt; when the -g/--gui flag is specified. This variable overrides the value configured in &lt;code&gt;merge.guitool&lt;/code&gt;. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.&amp;lt;guitool&amp;gt;.cmd variable is defined." onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy;, &kcy;&acy;&kcy;&ocy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy;  <a href="git-difftool.html">git-difftool[1]</a> , &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &fcy;&lcy;&acy;&gcy; -g/--gui. &Ecy;&tcy;&acy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&iecy; &vcy;  <code>merge.guitool</code> . &Vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &ncy;&icy;&zhcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&ncy;&ycy; &dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;. &Lcy;&yucy;&bcy;&ocy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &icy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; difftool.&lt;guitool&gt;.cmd.</span></p> </dd> <dt id="Documentation/git-difftool.txt-difftoollttoolgtcmd"><span data-i18n="055471f4ce941efa3f8f6a0486da97650530318bd8f10c32fb2eefb3d87d2e13/e2" data-source="difftool.&amp;lt;tool&amp;gt;.cmd" onmousemove="i18n(this)">difftool.&lt;tool&gt;.cmd</span></dt> <dd> <p><span data-i18n="5f15504c6015091019253fb0006ecf96650f8edad8bdf3a890c00f848159af61/cd" data-source="Specify the command to invoke the specified diff tool. The specified command is evaluated in shell with the following variables available: &lt;code&gt;LOCAL&lt;/code&gt; is set to the name of the temporary file containing the contents of the diff pre-image and &lt;code&gt;REMOTE&lt;/code&gt; is set to the name of the temporary file containing the contents of the diff post-image." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &dcy;&lcy;&yacy; &vcy;&ycy;&zcy;&ocy;&vcy;&acy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;. &Ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &ocy;&tscy;&iecy;&ncy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &ocy;&bcy;&ocy;&lcy;&ocy;&chcy;&kcy;&iecy; &scy;&ocy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&mcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy;: &dcy;&lcy;&yacy;  <code>LOCAL</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &icy;&zcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;, &acy; &dcy;&lcy;&yacy;  <code>REMOTE</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;. -&icy;&zcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&iecy;.</span></p> <p><span data-i18n="c99fa049118066fa8c7f7ba4a540d396947d2e009d31b6c08db02df63edd21e4/66" data-source="See the &lt;code&gt;--tool=&amp;lt;tool&amp;gt;&lt;/code&gt; option in &lt;a href=&quot;git-difftool&quot;&gt;git-difftool[1]&lt;/a&gt; for more details." onmousemove="i18n(this)">&Dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &scy;&mcy;. &vcy; &ocy;&pcy;&tscy;&icy;&icy;  <code>--tool=&lt;tool&gt;</code>  &vcy;  <a href="git-difftool.html">git-difftool[1]</a> .</span></p> </dd> <dt id="Documentation/git-difftool.txt-difftoollttoolgtpath"><span data-i18n="5e56ea24f772d6c7c81bc82b4d239eecbafacd024c61487a9dbcec9c0c8fd793/b2" data-source="difftool.&amp;lt;tool&amp;gt;.path" onmousemove="i18n(this)">difftool.&lt;tool&gt;.path</span></dt> <dd> <p><span data-i18n="6c856ef0157c6ed59b710655d92f69ad49dd0e03d2545aecd49c0f8e764dee23/83" data-source="Override the path for the given tool. This is useful in case your tool is not in the PATH." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &pcy;&ucy;&tcy;&softcy; &dcy;&lcy;&yacy; &dcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ocy;, &iecy;&scy;&lcy;&icy; &vcy;&acy;&shcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &vcy; PATH.</span></p> </dd> <dt id="Documentation/git-difftool.txt-difftooltrustExitCode"><span data-i18n="34ffe65eeb590f122fa5e2c01d7915a47d098a01399dffd3f0914930f15e8cad/2e" data-source="difftool.trustExitCode" onmousemove="i18n(this)">difftool.trustExitCode</span></dt> <dd> <p><span data-i18n="733318a76ba4350eac140c6397eb5cbcf7bceb65bfb65f088a5e6eb2ec46188f/60" data-source="Exit difftool if the invoked diff tool returns a non-zero exit status." onmousemove="i18n(this)">&Vcy;&ycy;&jcy;&dcy;&icy;&tcy;&iecy; &icy;&zcy; difftool, &iecy;&scy;&lcy;&icy; &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; diff &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy; &ncy;&iecy;&ncy;&ucy;&lcy;&iecy;&vcy;&ocy;&jcy; &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy;.</span></p> <p><span data-i18n="dcdd73a7db81f2999b7bc43a7304a4cee009320d63346096113f52608abefff1/bf" data-source="See the &lt;code&gt;--trust-exit-code&lt;/code&gt; option in &lt;a href=&quot;git-difftool&quot;&gt;git-difftool[1]&lt;/a&gt; for more details." onmousemove="i18n(this)">&Dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &scy;&mcy;. &vcy; &ocy;&pcy;&tscy;&icy;&icy;  <code>--trust-exit-code</code>  &vcy;  <a href="git-difftool.html">git-difftool[1]</a> .</span></p> </dd> <dt id="Documentation/git-difftool.txt-difftoolprompt"><span data-i18n="ed270ad78447cbd93900d853df2cd709e820a58a59b363d10071264f862e4c72/c5" data-source="difftool.prompt" onmousemove="i18n(this)">difftool.prompt</span></dt> <dd> <p><span data-i18n="74212064d1a1b335dac02e4725a2dada2b14bedfca8848e2eb38e30866c518c7/a2" data-source="Prompt before each invocation of the diff tool." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&dcy; &kcy;&acy;&zhcy;&dcy;&ycy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&mcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt-difftoolguiDefault"><span data-i18n="33803552e5e0817028a3cbc310fb8b3a349d698538c82314ee47ffa49a7febea/76" data-source="difftool.guiDefault" onmousemove="i18n(this)">difftool.guiDefault</span></dt> <dd> <p><span data-i18n="937b513b2317efbb50a8d225cf14318bdafcd6f26f174768717d12b4ef2af0e4/c4" data-source="Set &lt;code&gt;true&lt;/code&gt; to use the &lt;code&gt;diff.guitool&lt;/code&gt; by default (equivalent to specifying the &lt;code&gt;--gui&lt;/code&gt; argument), or &lt;code&gt;auto&lt;/code&gt; to select &lt;code&gt;diff.guitool&lt;/code&gt; or &lt;code&gt;diff.tool&lt;/code&gt; depending on the presence of a &lt;code&gt;DISPLAY&lt;/code&gt; environment variable value. The default is &lt;code&gt;false&lt;/code&gt;, where the &lt;code&gt;--gui&lt;/code&gt; argument must be provided explicitly for the &lt;code&gt;diff.guitool&lt;/code&gt; to be used." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy;  <code>true</code>  &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;  <code>diff.guitool</code>  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; (&ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yucy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;  <code>--gui</code> ) &icy;&lcy;&icy;  <code>auto</code>  &dcy;&lcy;&yacy; &vcy;&ycy;&bcy;&ocy;&rcy;&acy;  <code>diff.guitool</code>  &icy;&lcy;&icy;  <code>diff.tool</code>  &vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &ncy;&acy;&lcy;&icy;&chcy;&icy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &scy;&rcy;&iecy;&dcy;&ycy;  <code>DISPLAY</code> . &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  <code>false</code>  , &gcy;&dcy;&iecy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;  <code>--gui</code>  &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &bcy;&ycy;&tcy;&softcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &yacy;&vcy;&ncy;&ocy;, &chcy;&tcy;&ocy;&bcy;&ycy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ycy;&lcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>diff.guitool</code> .</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_see_also"><span data-i18n="2fa97693b70fa87b95b2d1bdf9558e4ac65d5e82d145f13a03849c4d9c4957a9/40" data-source="See also" onmousemove="i18n(this)">See also</span></h2> <div> <div> <dl> <dt id="Documentation/git-difftool.txt-ahrefdocsgit-diffgit-diff1a"> <a href="git-diff.html"><span data-i18n="da65d4620a3d7abd3242e1ece2f0cbd3514c5b3c595bcabe1b1d21537a25f2ee/07" data-source="git-diff[1]" onmousemove="i18n(this)">git-diff[1]</span></a> </dt> <dd> <p><span data-i18n="a832657de4c531b1c88fbbb63d0bb41a92d070631f35b54b554915368e436c0d/06" data-source="Show changes between commits, commit and working tree, etc" onmousemove="i18n(this)">&Pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &mcy;&iecy;&zhcy;&dcy;&ucy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&mcy;&icy;, &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&mcy;&icy; &icy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;&mcy; &icy; &tcy;. &dcy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt-ahrefdocsgit-mergetoolgit-mergetool1a"> <a href="git-mergetool.html"><span data-i18n="dbba4621cc23fc2e24c77efab1105384009a21383ef74ceb22dc8e3eb5902392/12" data-source="git-mergetool[1]" onmousemove="i18n(this)">git-mergetool[1]</span></a> </dt> <dd> <p><span data-i18n="f1d80e886d84e25811cc71199c6416a869c6836cfc4005b4f476e268d4e8de0f/28" data-source="Run merge conflict resolution tools to resolve merge conflicts" onmousemove="i18n(this)">&Zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ycy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &chcy;&tcy;&ocy;&bcy;&ycy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-difftool.txt-ahrefdocsgit-configgit-config1a"> <a href="git-config.html"><span data-i18n="984809986f96f7ce92da0ce1bbb03b4e630c987ba659334cdabf01c605b52046/d8" data-source="git-config[1]" onmousemove="i18n(this)">git-config[1]</span></a> </dt> <dd> <p><span data-i18n="d242e539dc21b0d815d3812c817435faa2b959f8f6e48e746e1c97d44708820d/57" data-source="Get and set repository or global options" onmousemove="i18n(this)">&Pcy;&ocy;&lcy;&ucy;&chcy;&icy;&tcy;&softcy; &icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy; &icy;&lcy;&icy; &gcy;&lcy;&ocy;&bcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy;</span></p> </dd> </dl> </div> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/git-difftool">https://git-scm.com/docs/git-difftool</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                               <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-fast-export.html">
                            git fast-export                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-fast-import.html">
                            git fast-import                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-fetch.html">
                            git fetch                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-fetch-pack.html">
                            git fetch-pack                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-filter-branch.html">
                            git filter-branch                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-fmt-merge-msg.html">
                            git fmt-merge-msg                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-for-each-ref.html">
                            git for-each-ref                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="git-difftool.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>